From 84b9298c75752c3dac3232efa33a8e102d003524 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Thu, 10 Aug 2006 15:45:47 +0100 Subject: [PATCH] [HVM] Remove unused apic_enabled field from hvm_info_table. Signed-off-by: Keir Fraser --- tools/firmware/hvmloader/hvmloader.c | 9 ++++++--- tools/libxc/xc_hvm_build.c | 1 - xen/arch/x86/hvm/hvm.c | 1 - xen/include/public/hvm/hvm_info_table.h | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index ec38f5737e..7d95cf8f82 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -26,7 +26,7 @@ #include "hypercall.h" #include "util.h" #include -#include +#include /* memory map */ #define HYPERCALL_PHYSICAL_ADDRESS 0x00080000 @@ -172,7 +172,7 @@ init_hypercalls(void) int main(void) { - struct hvm_info_table *t = get_hvm_info_table(); + struct xen_hvm_param hvm_param; puts("HVM Loader\n"); @@ -180,7 +180,10 @@ main(void) puts("Loading ROMBIOS ...\n"); memcpy((void *)ROMBIOS_PHYSICAL_ADDRESS, rombios, sizeof(rombios)); - if (t->apic_enabled) + + hvm_param.domid = DOMID_SELF; + hvm_param.index = HVM_PARAM_APIC_ENABLED; + if (!hypercall_hvm_op(HVMOP_get_param, &hvm_param) && hvm_param.value) create_mp_tables(); if (cirrus_check()) { diff --git a/tools/libxc/xc_hvm_build.c b/tools/libxc/xc_hvm_build.c index 546668f33d..d374631913 100644 --- a/tools/libxc/xc_hvm_build.c +++ b/tools/libxc/xc_hvm_build.c @@ -185,7 +185,6 @@ static int set_hvm_info(int xc_handle, uint32_t dom, strncpy(va_hvm->signature, "HVM INFO", 8); va_hvm->length = sizeof(struct hvm_info_table); va_hvm->acpi_enabled = acpi; - va_hvm->apic_enabled = apic; va_hvm->nr_vcpus = vcpus; set_hvm_info_checksum(va_hvm); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 62b328de54..2b1f7c887a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -47,7 +47,6 @@ #endif #include #include -#include #include #include diff --git a/xen/include/public/hvm/hvm_info_table.h b/xen/include/public/hvm/hvm_info_table.h index 69e5dcf19a..3b705eeedf 100644 --- a/xen/include/public/hvm/hvm_info_table.h +++ b/xen/include/public/hvm/hvm_info_table.h @@ -16,7 +16,6 @@ struct hvm_info_table { uint32_t length; uint8_t checksum; uint8_t acpi_enabled; - uint8_t apic_enabled; uint32_t nr_vcpus; }; -- 2.30.2